don't overwrite application properties. Fixes bug #136802.

2004-03-11  Mark McLoughlin  <mark@skynet.ie>

        * gtk/gtksettings.c: (apply_queued_setting): don't overwrite
        application properties. Fixes bug #136802.

diff --git a/ChangeLog b/ChangeLog
index f073b5b8302df9d8bccefcbfd829edd151a83f6f..7c2dd6689e037608ae87abc705b12bfbc06dd257 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-11  Mark McLoughlin  <mark@skynet.ie>
+
+       * gtk/gtksettings.c: (apply_queued_setting): don't overwrite
+       application properties. Fixes bug #136802.
+
 2004-03-11  Dov Grobgeld  <dov@imagic.weizmann.ac.il>
 
        * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f073b5b8302df9d8bccefcbfd829edd151a83f6f..7c2dd6689e037608ae87abc705b12bfbc06dd257 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-03-11  Mark McLoughlin  <mark@skynet.ie>
+
+       * gtk/gtksettings.c: (apply_queued_setting): don't overwrite
+       application properties. Fixes bug #136802.
+
 2004-03-11  Dov Grobgeld  <dov@imagic.weizmann.ac.il>
 
        * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f073b5b8302df9d8bccefcbfd829edd151a83f6f..7c2dd6689e037608ae87abc705b12bfbc06dd257 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-03-11  Mark McLoughlin  <mark@skynet.ie>
+
+       * gtk/gtksettings.c: (apply_queued_setting): don't overwrite
+       application properties. Fixes bug #136802.
+
 2004-03-11  Dov Grobgeld  <dov@imagic.weizmann.ac.il>
 
        * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f073b5b8302df9d8bccefcbfd829edd151a83f6f..7c2dd6689e037608ae87abc705b12bfbc06dd257 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-03-11  Mark McLoughlin  <mark@skynet.ie>
+
+       * gtk/gtksettings.c: (apply_queued_setting): don't overwrite
+       application properties. Fixes bug #136802.
+
 2004-03-11  Dov Grobgeld  <dov@imagic.weizmann.ac.il>
 
        * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f073b5b8302df9d8bccefcbfd829edd151a83f6f..7c2dd6689e037608ae87abc705b12bfbc06dd257 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-03-11  Mark McLoughlin  <mark@skynet.ie>
+
+       * gtk/gtksettings.c: (apply_queued_setting): don't overwrite
+       application properties. Fixes bug #136802.
+
 2004-03-11  Dov Grobgeld  <dov@imagic.weizmann.ac.il>
 
        * gtk/gtktextlayer.c: (gtk_text_layout_set_buffer): Added

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index ef2fb2e0410a08e9d92b625734aa5d53c84e27e2..e6e423fa595a996e753a0b0770caa64a70c1418d 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -684,8 +684,11 @@ apply_queued_setting (GtkSettings             *data,
   if (_gtk_settings_parse_convert (parser, &qvalue->public.value,
                                   pspec, &tmp_value))
     {
-      g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value);
-      data->property_values[pspec->param_id - 1].source = qvalue->source;
+      if (data->property_values[pspec->param_id - 1].source <= qvalue->source)
+       {
+         g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value);
+         data->property_values[pspec->param_id - 1].source = qvalue->source;
+       }
     }
   else
     {